From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 3 Feb 2011 17:34:50 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4685^2~75
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e3efdba28a3296aa08dc08bdd6c6e51e1eb98c9d;p=emacs.git

Merge from mainline.
---

e3efdba28a3296aa08dc08bdd6c6e51e1eb98c9d